bitkeeper revision 1.1327.1.15 (4272b1a8fCzXHatP1Qs_LnEeeJWW8A)

Oops on more code cleanup

diff --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
index 998ce2b83216e5631cd8597cf67d55093084a63b..d725659e2d8657a1f3badf5d473d15fa6cf3964b 100644 (file)
--- a/xen/arch/ia64/tools/mkbuildtree
+++ b/xen/arch/ia64/tools/mkbuildtree
@@ -168,7 +168,7 @@ softlink include/asm-generic/vmlinux.lds.h include/asm-generic/vmlinux.lds.h vml
 
 # xen/include/asm-ia64 files
 
-cp_patch arch/ia64/hp/sim/hpsim_ssc.h include/asm-ia64/hpsim_ssc.h hpsim_ssc.h
+#cp_patch arch/ia64/hp/sim/hpsim_ssc.h include/asm-ia64/hpsim_ssc.h hpsim_ssc.h
 
 #cp_patch include/asm-ia64/current.h include/asm-ia64/current.h current.h
 softlink include/asm-ia64/current.h include/asm-ia64/current.h
@@ -263,7 +263,8 @@ softlink include/asm-ia64/ustack.h include/asm-ia64/ustack.h
 
 # xen/include/asm-ia64/linux/*.h (== linux/include/linux/*.h)
 
-cp_patch include/linux/bootmem.h include/asm-ia64/linux/bootmem.h bootmem.h
+#cp_patch include/linux/bootmem.h include/asm-ia64/linux/bootmem.h bootmem.h
+softlink include/linux/bootmem.h include/asm-ia64/linux/bootmem.h
 cp_patch include/linux/cpumask.h include/asm-ia64/linux/cpumask.h cpumask.h
 #cp_patch include/linux/dma-mapping.h include/asm-ia64/linux/dma-mapping.h dma-mapping.h
 softlink include/linux/dma-mapping.h include/asm-ia64/linux/dma-mapping.h